auto merge of #125 : alexcrichton/cargo/issue-120, r=wycats
authorbors <bors@rust-lang.org>
Tue, 8 Jul 2014 05:14:55 +0000 (05:14 +0000)
committerbors <bors@rust-lang.org>
Tue, 8 Jul 2014 05:14:55 +0000 (05:14 +0000)
Closes #120


Trivial merge